Auto merge of #2215 - JIghtuse:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 16 Dec 2015 16:12:29 +0000 (16:12 +0000)
committerbors <bors@rust-lang.org>
Wed, 16 Dec 2015 16:12:29 +0000 (16:12 +0000)
Fixes #2197


Trivial merge